libostree: Fix build failure with glib 2.42

G_DEFINE_AUTOPTR_CLEANUP_FUNC is a new function in GLib 2.44, but
libglnx contains a backported version of it. A few source files were
however using G_DEFINE_AUTOPTR_CLEANUP_FUNC either without including
libglnx.h, or without including it early enough.

This fix is similar to the one in commit d368624.

Closes #376

Closes: #377
Approved by: smcv

diff --git a/src/libostree/ostree-gpg-verifier.c b/src/libostree/ostree-gpg-verifier.c
index 0ec0b515a5fe68ca23ce2007ce244effaad20839..d487507f89696291061de44f2f66df65e25253cf 100644 (file)
--- a/src/libostree/ostree-gpg-verifier.c
+++ b/src/libostree/ostree-gpg-verifier.c
@@ -23,6 +23,7 @@
 
 #include "config.h"
 
+#include "libglnx.h"
 #include "ostree-gpg-verifier.h"
 #include "ostree-gpg-verify-result-private.h"
 #include "otutil.h"

diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index 2d590bb5c086090e0d36cf7703ac573d6f05db98..438f5958a8cc61870f9ad9a8af17217c5f8e02eb 100644 (file)
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -22,12 +22,12 @@
 
 #include "config.h"
 
+#include "libglnx.h"
 #include "ostree.h"
 #include "otutil.h"
 
 #ifdef HAVE_LIBSOUP
 
-#include "libglnx.h"
 #include "ostree-core-private.h"
 #include "ostree-repo-private.h"
 #include "ostree-repo-static-delta-private.h"